projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
27036e9
)
(rx-or): Fix the case of "(rx (and ?a (or ?b ?c) ?d))".
author
Eli Zaretskii
<eliz@gnu.org>
Sat, 1 Nov 2003 17:35:23 +0000
(17:35 +0000)
committer
Eli Zaretskii
<eliz@gnu.org>
Sat, 1 Nov 2003 17:35:23 +0000
(17:35 +0000)
lisp/emacs-lisp/rx.el
patch
|
blob
|
history
diff --git
a/lisp/emacs-lisp/rx.el
b/lisp/emacs-lisp/rx.el
index 8e38aed10d2cfc1c36ba517ad1ca7ee5de378b41..bc16a84b156da327535fafbabe44dcbb561536ba 100644
(file)
--- a/
lisp/emacs-lisp/rx.el
+++ b/
lisp/emacs-lisp/rx.el
@@
-286,9
+286,11
@@
FORM is of the form `(and FORM1 ...)'."
(dolist (arg (cdr form))
(unless (stringp arg)
(setq all-args-strings nil)))
- (if all-args-strings
- (regexp-opt (cdr form))
- (mapconcat #'rx-to-string (cdr form) "\\|"))))
+ (concat "\\(?:"
+ (if all-args-strings
+ (regexp-opt (cdr form))
+ (mapconcat #'rx-to-string (cdr form) "\\|"))
+ "\\)")))
(defun rx-quote-for-set (string)